From 2ab48f2970ca9821654ed1d66316d6280537f80e Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Tue, 28 Oct 2008 21:22:20 +0000
Subject: [PATCH] Paranoid page table check

---
 includes/specials/SpecialMergeHistory.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/specials/SpecialMergeHistory.php b/includes/specials/SpecialMergeHistory.php
index 8756c624bd..d16f3085b2 100644
--- a/includes/specials/SpecialMergeHistory.php
+++ b/includes/specials/SpecialMergeHistory.php
@@ -434,10 +434,10 @@ class MergeHistoryPager extends ReverseChronologicalPager {
 	function getQueryInfo() {
 		$conds = $this->mConds;
 		$conds['rev_page'] = $this->articleID;
+		$conds['page_id'] = 'rev_page';
 		$conds[] = "rev_timestamp < {$this->maxTimestamp}";
-
 		return array(
-			'tables' => array('revision'),
+			'tables' => array('revision','page'),
 			'fields' => array( 'rev_minor_edit', 'rev_timestamp', 'rev_user', 'rev_user_text', 'rev_comment',
 				 'rev_id', 'rev_page', 'rev_text_id', 'rev_len', 'rev_deleted' ),
 			'conds' => $conds
-- 
2.20.1